6dd00fe3e6451652613bb4064e7c01d5c4d8914a,geoserver/webapp/src/main/java/com/boundlessgeo/geoserver/api/controllers/IconController.java,IconController,raw,#String#String#,175

Before Change


    @RequestMapping(value = "/{wsName}/{icon:.+}", method = RequestMethod.GET)
    public HttpEntity raw(@PathVariable String wsName, @PathVariable String icon) throws IOException {

        WorkspaceInfo ws = findWorkspace(wsName, catalog());

        GeoServerResourceLoader rl = geoServer.getCatalog().getResourceLoader();
        Resource resource = rl.get(Paths.path("workspaces",ws.getName(),"styles",icon));

        if( resource.getType() != Type.RESOURCE ){
            throw new NotFoundException("Icon "+icon+" not found");

After Change


        WorkspaceInfo ws;
        Resource resource;
        
        if (wsName == null) {
            ws = null;
            resource = dataDir().getRoot("styles", icon);
        } else {
            ws = findWorkspace(wsName, catalog());
            resource = dataDir().get(ws, "styles", icon);
        }
        
        if( resource.getType() != Type.RESOURCE ){